From 9238385eb8b3a34a4f0083da277423279cb32d71 Mon Sep 17 00:00:00 2001
From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Mon, 28 Jul 2003 21:08:43 +0000
Subject: [PATCH] More "zero value added" language cleanups.

---
 gpsbabel/defs.h          | 1 +
 gpsbabel/easygps.c       | 2 +-
 gpsbabel/garmin_tables.h | 4 ++++
 gpsbabel/gpilots.c       | 2 +-
 gpsbabel/jeeps/gpsmath.c | 1 +
 gpsbabel/jeeps/gpsutil.c | 1 +
 gpsbabel/mapsend.c       | 4 ++--
 gpsbabel/util.c          | 2 +-
 8 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index e2c309ac0..cc445c91c 100644
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -377,6 +377,7 @@ signed int be_read16(void *p);
 signed int be_read32(void *p);
 signed int le_read16(void *p);
 signed int le_read32(void *p);
+void le_read64(void *dest, const void *src);
 void be_write16(void *pp, unsigned i);
 void be_write32(void *pp, unsigned i);
 void le_write16(void *pp, unsigned i);
diff --git a/gpsbabel/easygps.c b/gpsbabel/easygps.c
index 7ec472e4f..cb53059ae 100644
--- a/gpsbabel/easygps.c
+++ b/gpsbabel/easygps.c
@@ -212,7 +212,7 @@ static void
 ez_disp(const waypoint *wpt)
 {
 	char tbuf[8];
-	fprintf(file_out, "W", 0xb);
+	fprintf(file_out, "W");
 	if (wpt->shortname) {
 		fputc(1, file_out);
 		write_pstring(wpt->shortname);
diff --git a/gpsbabel/garmin_tables.h b/gpsbabel/garmin_tables.h
index c7d56c99d..c6481f2f5 100644
--- a/gpsbabel/garmin_tables.h
+++ b/gpsbabel/garmin_tables.h
@@ -31,6 +31,10 @@ typedef enum {MAPSOURCE, PCX, GARMIN_SERIAL} garmin_formats_e;
 extern const 
 char *mps_find_desc_from_icon_number(const int icon, 
 	garmin_formats_e garmin_format);
+extern int
+mps_find_icon_number_from_desc(const char *desc, 
+	garmin_formats_e garmin_format);
+
 
 /* MapSource 4.13 */
 static icon_mapping_t icon_table[] = {
diff --git a/gpsbabel/gpilots.c b/gpsbabel/gpilots.c
index e39c5b8a3..e9dce03cd 100644
--- a/gpsbabel/gpilots.c
+++ b/gpsbabel/gpilots.c
@@ -184,7 +184,7 @@ data_read(void)
 			/* blah */
 			break;
 		default:
-			fatal(MYNAME ": Unknown file type 0x%x\n", pdb->type);
+			fatal(MYNAME ": Unknown file type 0x%x\n", (int) pdb->type);
 	}
 	
 	for(pdb_rec = pdb->rec_index.rec; pdb_rec; pdb_rec=pdb_rec->next) {
diff --git a/gpsbabel/jeeps/gpsmath.c b/gpsbabel/jeeps/gpsmath.c
index c5c623335..bddf5f1da 100644
--- a/gpsbabel/jeeps/gpsmath.c
+++ b/gpsbabel/jeeps/gpsmath.c
@@ -22,6 +22,7 @@
 ** Boston, MA  02111-1307, USA.
 ********************************************************************/
 #include "gps.h"
+#include <stdlib.h>
 #include <math.h>
 #include <string.h>
 #include "gpsdatum.h"
diff --git a/gpsbabel/jeeps/gpsutil.c b/gpsbabel/jeeps/gpsutil.c
index 367433120..7311d019a 100644
--- a/gpsbabel/jeeps/gpsutil.c
+++ b/gpsbabel/jeeps/gpsutil.c
@@ -22,6 +22,7 @@
 ** Boston, MA  02111-1307, USA.
 ********************************************************************/
 #include "gps.h"
+#include <stdlib.h>
 #include <fcntl.h>
 #include <stdarg.h>
 
diff --git a/gpsbabel/mapsend.c b/gpsbabel/mapsend.c
index d1cb83b7e..153af1d0f 100644
--- a/gpsbabel/mapsend.c
+++ b/gpsbabel/mapsend.c
@@ -524,7 +524,7 @@ void mapsend_track_hdr(const route_head * trk)
 	char *tname;
 	unsigned char c;
 	int i;
-	mapsend_hdr hdr = {13, "4D533334 MS", "30", ms_type_track, 0};
+	mapsend_hdr hdr = {13, "4D533334 MS", "30", ms_type_track, {0}};
 	
 	switch (trk_version) {
 		case 20: verstring = "30"; break;
@@ -619,7 +619,7 @@ mapsend_track_write(void)
 static void
 mapsend_wpt_write(void)
 {
-	mapsend_hdr hdr = {13, "4D533330 MS", "30", ms_type_wpt, 0};
+	mapsend_hdr hdr = {13, {"4D533330 MS"}, {"30"}, ms_type_wpt, {0}};
 	int wpt_count = waypt_count();
 	int n = 0;
 	
diff --git a/gpsbabel/util.c b/gpsbabel/util.c
index 73852a1c5..fbca2b8be 100644
--- a/gpsbabel/util.c
+++ b/gpsbabel/util.c
@@ -372,7 +372,7 @@ le_read32(void *addr)
  *  in host endianness.
  */
 void
-le_read64(void *dest, void *src)
+le_read64(void *dest, const void *src)
 {
 	char *cdest = dest;
 	char *csrc = src;
-- 
2.30.2